From adf60fb3a10cb12115fe7599dd13f3282b79e2e4 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Thu, 29 Oct 2020 09:46:02 -0700 Subject: [PATCH] macos: be tolerant of NULL GL context Some code appears to unconditionally attempt to make the context current, so this makes things tolerant to a NULL GdkGLContext and just return FALSE. --- gdk/macos/gdkmacosdisplay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdk/macos/gdkmacosdisplay.c b/gdk/macos/gdkmacosdisplay.c index 6a89def8c1..665a567e70 100644 --- a/gdk/macos/gdkmacosdisplay.c +++ b/gdk/macos/gdkmacosdisplay.c @@ -649,7 +649,10 @@ gdk_macos_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *gl_context) { g_assert (GDK_IS_MACOS_DISPLAY (display)); - g_assert (GDK_IS_MACOS_GL_CONTEXT (gl_context)); + g_assert (!gl_context || GDK_IS_MACOS_GL_CONTEXT (gl_context)); + + if (gl_context == NULL) + return FALSE; return _gdk_macos_gl_context_make_current (GDK_MACOS_GL_CONTEXT (gl_context)); } -- 2.30.2